Skip to content

likeconan/thailand-reservation

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

93 Commits
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

Repository files navigation

Thailand Finish in June 1st

Prerequisite

Contributors

    Gao, Linda

Essential Parts with Git

checkout the commands with the Basic Command

Never make changes on master branch, it only can be merged with develop branch

When start working on a new feature, follow these commands:

    git checkout develop (switch to develop branch)
    git pull (if there is new changes)
    git branch feature-[name]  (create a new branch,[name] means optional parameter)

then start working on the new feature/[name] branch, you can commit and push it to the remote,after finishing it,

you can try to merge to the develop branch by these commands:

    git checkout develop
    git pull
    git merge feature/[name]  (merge the feature/[name] branch to develop)
    git push -u origin develop (push the merged code to develop)
    git push origin --delete feature/[name] (delete the remote one)
    git branch -d feature/[name] (delete the local feature/[name] branch )

When there is a bug you need to fix, create branch named bugfix/[name] base on develop branch

and follow the same steps like you do on feature

Start web client app

Open the directory you want to put the code, and open git bash enter below commands:

    git clone https://github.com/likeconan/Thailand.git

Then open the code repository with VSCode and open the terminal enter below commands:

    npm install
    npm start

Then open your browser and navigate to localhost:3000

Conventions and Architecture

    /client
        /build                                  -- build by webpack and should not be uploaded
        /config                                 -- used in different environment
        /src
            /actions                            -- actions for redux
              user.action.js                    -- export function to execute in frontend
            /components-dumb                    -- dumb components in react without redux
              /Styles                           -- styles for components
                user-login.less
              UserLogin.js
            /components-page                    -- page components in react
            /components-smart                   -- smart components in react with redux
        /reducers                               -- redux reducers
        /utilities                              -- common functions
        app.client.js                           -- react root
        store.js                                -- redux store
        webpack.config.js
        server.js

    /server
        /controllers                           -- all dal functions created in here
           base.controller.js                  -- implemented
           user.controller.js
        /lib                                   -- set config and inital for routes
        /models                                -- models

About

No description, website, or topics provided.

Resources

Stars

Watchers

Forks

Releases

No releases published

Packages

No packages published

Contributors 2

  •  
  •