Skip to content
This repository has been archived by the owner on Jan 20, 2024. It is now read-only.

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
tdemin committed Oct 28, 2019
2 parents d6301b4 + fba5c0c commit 332968c
Show file tree
Hide file tree
Showing 8 changed files with 58 additions and 5 deletions.
1 change: 1 addition & 0 deletions Dockerfile
Expand Up @@ -8,6 +8,7 @@ RUN yarn install

COPY public /app/public
COPY src /app/src
ARG REACT_APP_APIURI=https://amber.h.tdem.in/api
RUN yarn build

FROM nginx:1.16-alpine AS release
Expand Down
38 changes: 38 additions & 0 deletions README.md
@@ -0,0 +1,38 @@
## Amber Web

The web client for [Project Amber](/tdemin/amber), made with React,
Redux, and TypeScript.

#### Running the app locally

###### Development

Simply run:

% yarn install --dev
% yarn start

Set the `REACT_APP_APIURI` environment variable in case you're testing against
a local server. It should point to the base URI for all API requests, namely
`https://amber.h.tdem.in/api`.

###### Docker

Run:

% docker build . -t amber_web
% docker run -it -p 8080:80 amber_web

If you're running your own API server, be sure to set the
`REACT_APP_APIURI` flag when building:

% docker build . -t amber_web --build-arg REACT_APP_APIURI=https://your.tld/api

#### Development

The source code of this app is formatted automatically with Prettier. Be sure
to run `yarn beautify` and `yarn lint` before sending a pull request!

#### License

This program is MIT-licensed. See [LICENSE.txt](LICENSE.txt) for details.
2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "amber_web",
"version": "0.0.4",
"version": "0.0.4.1",
"private": true,
"dependencies": {
"@types/jest": "24.0.18",
Expand Down
2 changes: 1 addition & 1 deletion public/index.html
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8" />
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta name="theme-color" content="#ffffff" />
<meta
name="description"
content="Amber Web, a task list app."
Expand Down
2 changes: 1 addition & 1 deletion public/manifest.json
Expand Up @@ -20,6 +20,6 @@
],
"start_url": ".",
"display": "standalone",
"theme_color": "#000000",
"theme_color": "#ffffff",
"background_color": "#ffffff"
}
5 changes: 3 additions & 2 deletions src/const.ts
@@ -1,6 +1,7 @@
export const baseURI: string = "https://amber.h.tdem.in/api";
export const baseURI: string =
process.env.REACT_APP_APIURI || "https://amber.h.tdem.in/api";

export const appVersion: string = "0.0.4";
export const appVersion: string = "0.0.4.1";
export const appFullName: string = "Amber Web";
export const appName: string = "amber_web";
export const appAuthor: string = "Timur Demin";
Expand Down
6 changes: 6 additions & 0 deletions src/views/styles/common.scss
Expand Up @@ -12,6 +12,12 @@ div.container {
max-width: 720px;
}

@media (min-width: 601px) {
div#root {
margin-top: $spacing * 16 !important;
}
}

@media (max-width: 600px) {
div.container {
margin: 0 $spacing;
Expand Down
7 changes: 7 additions & 0 deletions src/views/styles/tasks.scss
Expand Up @@ -37,6 +37,13 @@ div.taskList {
}
}

@media (min-width: 601px) {
div.taskLine {
margin: $spacing * 4 0 !important;
padding: $spacing * 4 !important;
}
}

@media (max-width: 600px) {
div.taskList {
div.taskSubtree {
Expand Down

0 comments on commit 332968c

Please sign in to comment.