-
Notifications
You must be signed in to change notification settings - Fork 5
Front end #11
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
lola98
wants to merge
38
commits into
master
Choose a base branch
from
front-end
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Front end #11
Changes from all commits
Commits
Show all changes
38 commits
Select commit
Hold shift + click to select a range
ebea260
update leasing card
0a2d846
Merge branch 'front-end' of https://github.com/UCSDCSSA/Duanzu into f…
d9f8e76
add image uploader
Hannahh1425 8fe1b65
Merge branch 'front-end' of https://github.com/UCSDCSSA/Duanzu into f…
Hannahh1425 821b79b
home page update
551d75a
Merge branch 'front-end' of https://github.com/UCSDCSSA/Duanzu into f…
8fe2fa3
new branch
ZixinShen b9a48b2
fixed modal
ZixinShen 98f45bb
Minor Fixes
Liby99 7d4a15d
Merge branch 'front-end' of github.com:UCSDCSSA/Duanzu into front-end
Liby99 eaa39a2
home page
b532b76
Merge branch 'master' into front-end
Liby99 fe1b311
Merge branch 'front-end' of github.com:UCSDCSSA/Duanzu into front-end
Liby99 75f0903
Add Popup Sample
Liby99 36dd027
update publish page and change index css
Hannahh1425 bba6f7c
Merge branch 'front-end' of https://github.com/UCSDCSSA/Duanzu into f…
Hannahh1425 66e7e46
update login
ZixinShen 8fd6c8d
merge conflict
ZixinShen 6d994c6
header update
ZixinShen 5aea73a
Minor Modifications
Liby99 c32fee5
Merge branch 'front-end' of github.com:UCSDCSSA/Duanzu into front-end
Liby99 1ed1cec
search page using multiple row
ltyDion 68dad32
search page using multiple rows
ltyDion 6f2650c
Resolved Conflict
Liby99 24e3b33
tmp
19ade4a
Merge branch 'master' of https://github.com/UCSDCSSA/Duanzu into fron…
49f6fff
temp
dfda5e5
Improved Login
Liby99 8e78ce6
Merge branch 'front-end' of https://github.com/UCSDCSSA/Duanzu into f…
c3bd4b9
Merge branch 'front-end' of https://github.com/UCSDCSSA/Duanzu into f…
978a28a
update image-uploader
Hannahh1425 248a8cd
Merge branch 'front-end' of https://github.com/UCSDCSSA/Duanzu into f…
Hannahh1425 28f0d4c
update home page
3b45ab8
Merge branch 'front-end' of https://github.com/UCSDCSSA/Duanzu into f…
2e9c5a2
New infra structure
ltyDion 0125fa6
add description for package.json
ltyDion 8fa1105
change styles about some files
ltyDion df1f6b0
Merge pull request #10 from UCSDCSSA/front-end-2.0
Liby99 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| [ignore] | ||
|
|
||
| [include] | ||
|
|
||
| [libs] | ||
|
|
||
| [lints] | ||
|
|
||
| [options] | ||
| module.name_mapper='.*\(.scss\)' -> 'empty/object' | ||
| module.name_mapper='^~/\(.*\)$' -> '<PROJECT_ROOT>/src/\1' | ||
|
|
||
| [strict] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| .DS_Store | ||
| node_modules/ | ||
| build/ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,90 +1,61 @@ | ||
| # UCSD CSSA Duanzu - React Front-end | ||
| # React Starter Web Repo | ||
|
|
||
| This repository contains all the (biased) setup files for a react web application: | ||
|
|
||
| - Folder structures | ||
| - Webpack & webpack dev server: You can develop fluently | ||
| - Flow typing: You get types in javascript | ||
| - `scss` & `css` loader: `import 'style.scss'` in your javascript files | ||
| - Home directory when import: You can write `import '~/components'` when import | ||
| - React Router: Front-end routing plugin | ||
| - An express server, so that you can build and then run the application on your server | ||
|
|
||
| ## Setup | ||
|
|
||
| Make sure you are in this folder (`source/react/`), and run the following | ||
| command to install the dependencies before you can run anything. | ||
| To setup this repo, first clone this to your local machine. Make sure you have node (10.0+) and npm (6.2+) installed, | ||
| and then | ||
|
|
||
| ```sh | ||
| ``` | ||
| $ npm install | ||
| ``` | ||
|
|
||
| Then you are good to go! Type | ||
| At the same time, make sure that you fill in all the `FILL-IN-` placeholders in | ||
| `package.json`. Also do install `flow-bin` in your computer in order to run the flow | ||
| type check. | ||
|
|
||
| ```sh | ||
| $ npm start | ||
| ``` | ||
| ## Development | ||
|
|
||
| to start the WebPack server and you can now go to your browser and type in | ||
| To develop this repo on your local machine, run | ||
|
|
||
| ``` | ||
| http://localhost:8080/ | ||
| $ npm run dev | ||
| ``` | ||
|
|
||
| to access the pages. | ||
| This will open up port `9000` on your machine. If you want to change the port, go to `src/config/webpack.dev.config.js`. | ||
| So now go to `localhost:9000/` on your browser, you can then see the page showing up. | ||
|
|
||
| ## File Structure | ||
| ## Build & Deploy | ||
|
|
||
| We will generate an express server serving a single-page application. To do that, run | ||
|
|
||
| ``` | ||
| react/ | ||
|
|
||
| ---Dependencies--- | ||
| |- node_modules/ | ||
|
|
||
| ---Working Files--- | ||
| |- public/ | ||
| |- js/ | ||
| |- css/ | ||
| |- index.html | ||
| |- components/ | ||
| |- index.js | ||
|
|
||
| ---Config Files Beyond This Point--- | ||
| |- package.json | ||
| |- package-lock.json | ||
| |- webpack.config.js | ||
| |- .babelrc | ||
| $ npm run build | ||
| ``` | ||
|
|
||
| The Dependencies Folder will not be there before you have used `npm install` to | ||
| install all the dependencies. Please do not touch any file in the directory. | ||
|
|
||
| What we are working on are the Working Files. Before getting into anything, | ||
| please do remind yourself for most of the cases we don't need to change any file | ||
| in `public/` folder as well as the `index.js` file. All we want to do is to | ||
| add files and modify them in `components/`. If you have any need to modify | ||
| `public/` or `index.js` please tell the administrator. All the files in | ||
| `components/` will be in `.js` format and will be React Renderable JSX files. | ||
|
|
||
| You also should not touch any file among the config files please notice. | ||
|
|
||
| ## File Organizing, Naming Instructions and Formatting | ||
| This command will create several compiled files under `src/build/`. Make sure `index.html`, `main.css`, `main.js` are | ||
| all there, then run | ||
|
|
||
| ### JSX Naming Instructions | ||
|
|
||
| For every file under `./components/`, please name the file using 'Capitalize | ||
| the first character for every word'. For example `AboutUs.js`, `Main.js` and so | ||
| on. In every `.JSX` file, you should have an `export`. Please make sure that | ||
| *the item you export* has exactly the same name as the file name. For example, | ||
| in `Main.js` you must have the last line `export default Main;`. | ||
|
|
||
| ### Router Naming Instructions | ||
|
|
||
| In `./components/Main.js` we define a bunch of routes for the application. Here | ||
| for every route that you create, we must keep the route has naming style 'all | ||
| lower-case words concatenated by `_`'. For example `/about_us`, | ||
| `/profile/change_password` and so on. Please note that you should not hesitate | ||
| to add extra path to group the routes. | ||
| ``` | ||
| $ npm start | ||
| ``` | ||
|
|
||
| ### Formatting | ||
| to start the express server. This will open up port `3000` on your machine. Go to `localhost:3000` to view the webpage | ||
| if you are running the production server on your own machine. If you are deploying this on a server, make sure you | ||
| redirect the requests to the port `3000`. Or if you want to pick another port, go to `src/config/express.config.js` and | ||
| change the `port` property there. | ||
|
|
||
| To make things easy and consistent, in all JSX files in `./components`, we use | ||
| the *default setting* of *Atom Beautifier* to format your code. If you are | ||
| using Atom, please go to [here](https://atom.io/packages/atom-beautify) | ||
| to install this plugin to Atom. If not, then *at least* follow the following | ||
| rules: | ||
| ## Clean | ||
|
|
||
| - All white-space using space (` `). No Tab (`\t`). | ||
| - All indentation are 4 spaces. | ||
| - All the JavaScript part of the code must not exceed 80 chars per line. | ||
| - Add semi-colon (`;`) to everywhere you need to. | ||
| ``` | ||
| $ npm run clean | ||
| ``` |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.