Skip to content
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.

Sign up for GitHub

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

Jump to bottom

237 v2 App Projects View #265

Merged
merged 16 commits into from Dec 28, 2021
Merged

237 v2 App Projects View #265

merged 16 commits into from Dec 28, 2021

Conversation

cherry-john
Copy link
Contributor

@cherry-john cherry-john commented Dec 18, 2021 •
edited

Add Projects to v2 app
closes #237

Version:

v2

Checklist:

  • Updates documentation (if so - is it in this PR, or on the v2 branch?)
  • Tested locally

@netlify
Copy link

netlify bot commented Dec 18, 2021 •
edited

✔️ Deploy Preview for adamrms-app ready!

🔨 Explore the source changes: 6e762f5

🔍 Inspect the deploy log: https://app.netlify.com/sites/adamrms-app/deploys/61cb4dacf64dad0007d5ed39

😎 Browse the preview: https://deploy-preview-265--adamrms-app.netlify.app

@cherry-john cherry-john self-assigned this Dec 18, 2021
@netlify
Copy link

netlify bot commented Dec 18, 2021 •
edited

✔️ Deploy Preview for adamrms-docs canceled.

🔨 Explore the source changes: 6e762f5

🔍 Inspect the deploy log: https://app.netlify.com/sites/adamrms-docs/deploys/61cb4dac88f38a000744821d

@cherry-john cherry-john added the enhancement New feature or request label Dec 18, 2021
@Robert-Watts
Copy link
Contributor

image

  • Message when there are no projects to display

@Robert-Watts
Copy link
Contributor

Robert-Watts commented Dec 18, 2021 •
edited by chriscn

image

  • Message when there are no projects to display

Sorry had not realised this was a draft PR, my bad

@Jbithell Jbithell had a problem deploying to adamrms-v2-staging-pr-265 December 18, 2021 17:34 Failure
@Jbithell Jbithell temporarily deployed to adamrms-v2-staging-pr-265 December 18, 2021 18:19 Inactive
@Jbithell
Copy link
Collaborator

@cherry-john despite me doing a succesful merge just before and then running the lint in this branch, there are now a few more conflicts. I am not familiar enough with this branch to really know whats' going on here but hopefully you'll be able to sort them relatively easily now we've done this merging

@cherry-john
Squashed commit of the following:
719dda3 
commit f199370
Author: James Bithell <Jbithell@users.noreply.github.com>
Date:   Sat Dec 18 18:17:06 2021 +0000

    Lint Everything (#268)

    * Lint App

    * Don't lint on Netifly

    * Apply requested tsconfig changes

commit 8bde02a
Author: John Cherry <jac677@york.ac.uk>
Date:   Sat Dec 18 17:45:29 2021 +0000

    Add message when no assets found (#261)

    * Add message when no assets found

    * Allow assets to be accessed directly

    * Fix merge conflict

    * Remove Import

    Co-authored-by: James Bithell <Jbithell@users.noreply.github.com>
    Co-authored-by: Robert Watts <11817698+Robert-Watts@users.noreply.github.com>
    Co-authored-by: Robert Watts <mail@rlwatts.co.uk>
@cherry-john
close #264
8564c06 
Also fixes Linting issues
@cherry-john
Add Project Assets view
84c06dd 
Currently just a list, needs statuses to be added
@cherry-john
Add crew list
a05218a 
TODO: add popovers when project is updated to Ionic 6
@cherry-john
Copy link
Contributor Author

More project work to come, this is the basic project view sorted

@cherry-john cherry-john marked this pull request as ready for review December 28, 2021 14:27
@cherry-john cherry-john requested a review from a team December 28, 2021 14:27
Robert-Watts
Robert-Watts reviewed Dec 28, 2021
View reviewed changes
Copy link
Contributor

@Robert-Watts Robert-Watts left a comment

Choose a reason for hiding this comment

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

Looks good, a few comments but nothing major. I have not tested this locally so as long as it works on your PC I am happy.

app/src/pages/projects/Project.tsx Show resolved Hide resolved
app/src/pages/projects/ProjectAssets.tsx Show resolved Hide resolved
app/src/pages/projects/Project.tsx Show resolved Hide resolved
app/src/type.d.ts Show resolved Hide resolved
@cherry-john cherry-john enabled auto-merge (squash) December 28, 2021 16:08
Robert-Watts
Robert-Watts previously approved these changes Dec 28, 2021
View reviewed changes
Jbithell
Jbithell requested changes Dec 28, 2021
View reviewed changes
adam-rms.code-workspace Outdated Show resolved Hide resolved
adam-rms.code-workspace Outdated Show resolved Hide resolved
app/src/utilities/Formatters.ts Show resolved Hide resolved
@Jbithell
Copy link
Collaborator

@cherry-john can you fix eslint failures to allow me to approve & merge?

@cherry-john cherry-john merged commit d9b7914 into v2 Dec 28, 2021
@cherry-john cherry-john deleted the 237-v2-projects branch December 28, 2021 17:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Jbithell Jbithell Jbithell approved these changes

@Robert-Watts Robert-Watts Robert-Watts left review comments

Assignees

@cherry-john cherry-john

Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Project Details
3 participants
@cherry-john @Robert-Watts @Jbithell