Skip to content

Commit

Permalink
Merge pull request #382 from photoview/redesign
Browse files Browse the repository at this point in the history
Redesign UI and remove SemanticUI dependency
  • Loading branch information
viktorstrate committed Jul 18, 2021
2 parents 0fb434e + c3d2ef7 commit 0587a7b
Show file tree
Hide file tree
Showing 149 changed files with 35,299 additions and 20,527 deletions.
2 changes: 1 addition & 1 deletion .dockerignore
Expand Up @@ -9,7 +9,7 @@ photos_path
screenshots

ui/node_modules/
ui/dist/
ui/build/
ui/.cache/

api/photo_cache
9 changes: 6 additions & 3 deletions Dockerfile
@@ -1,21 +1,24 @@
### Build UI ###
FROM --platform=${BUILDPLATFORM:-linux/amd64} node:15 as ui

ARG PHOTOVIEW_API_ENDPOINT
ENV PHOTOVIEW_API_ENDPOINT=${PHOTOVIEW_API_ENDPOINT}
ARG REACT_APP_API_ENDPOINT
ENV REACT_APP_API_ENDPOINT=${REACT_APP_API_ENDPOINT}

# Set environment variable UI_PUBLIC_URL from build args, uses "/" as default
ARG UI_PUBLIC_URL
ENV UI_PUBLIC_URL=${UI_PUBLIC_URL:-/}

ARG VERSION
ENV VERSION=${VERSION:-undefined}
ENV REACT_APP_VERSION=${VERSION:-undefined}

ARG BUILD_DATE
ENV BUILD_DATE=${BUILD_DATE:-undefined}
ENV REACT_APP_BUILD_DATE=${BUILD_DATE:-undefined}

ARG COMMIT_SHA
ENV COMMIT_SHA=${COMMIT_SHA:-}
ENV REACT_APP_COMMIT_SHA=${COMMIT_SHA:-}

RUN mkdir -p /app
WORKDIR /app
Expand Down Expand Up @@ -84,7 +87,7 @@ RUN apt-get purge -y curl gpg \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

COPY --from=ui /app/dist /ui
COPY --from=ui /app/build /ui
COPY --from=api /app/photoview /app/photoview

ENV PHOTOVIEW_LISTEN_IP 127.0.0.1
Expand Down
5 changes: 5 additions & 0 deletions ui/.eslintrc.js
Expand Up @@ -55,6 +55,11 @@ module.exports = {
'jest/valid-title': 'off',
}
),
settings: {
jest: {
version: 26,
},
},
}),
{
files: ['**/*.js'],
Expand Down
30 changes: 0 additions & 30 deletions ui/babel.config.js

This file was deleted.

100 changes: 0 additions & 100 deletions ui/build.mjs

This file was deleted.

7 changes: 7 additions & 0 deletions ui/craco.config.js
@@ -0,0 +1,7 @@
module.exports = {
style: {
postcss: {
plugins: [require('tailwindcss'), require('autoprefixer')],
},
},
}
2 changes: 1 addition & 1 deletion ui/example.env
@@ -1 +1 @@
PHOTOVIEW_API_ENDPOINT=http://localhost:4001/
REACT_APP_API_ENDPOINT=http://localhost:4001/

1 comment on commit 0587a7b

@Damix48
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚀🚀🚀

Please sign in to comment.