diff --git a/.DS_Store b/.DS_Store index d94030332..0dfef524b 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/.github/README.md b/.github/README.md index 42c125795..c43c3fc34 100644 --- a/.github/README.md +++ b/.github/README.md @@ -1,21 +1,20 @@ -``` +Join the [Telegram group](https://t.me/amsblockchainweek) -Enjoy EthCC 2021! +# Amsterdam Blockchain Week -``` +In 2022, DevConnect AMS takes place in April. While DevConnect AMS itself will be the flagship event series for the Ethereum communities with thousands descending upon Amsterdam for the week, there will be multiple side events, meetups, panels and parties also taking place during the same week in Amsterdam that might not fit on the Devconnect AMS official schedule (they do not list parties, for instance). -# EthCC Week +This is the Amsterdam Blockchain Week, a moment of inclusive conversations, educational gatherings, welcoming celebrations. If you're planning an event related to public blockchains and the decentralized movement, reach out to have it published on this website. -In 2021, EthCC takes place in July, after more than one year with very few opportunities to gather the Ethereum community IRL. While EthCC itself will be the flagship event with more than 100 speakers coming from all over the world, multiple side events, meetups, panels and parties will take place on the same week in Paris. - -This is the EthCC Week, a moment of inclusive conversations, educational gatherings, welcoming celebrations. If you're planning an event related to public blockchains and the decentralized movement, you're very welcome to add it to EthCC Week website. +The following event types will be listed here: +- Parties, social events +- Part-day gatherings, smaller events +- Events related to public blockchains and the decentralized movement This repository contains the code for the website, which can be reached at -[ethccweek.fr](https://ethccweek.fr/). +[amsterdamblockchainweek.org](https://amsterdamblockchainweek.org/). ## Contributing - -Please read the -[Wiki](https://github.com/EthCCWeek/ethccweek.fr/wiki) -for instructions on how to add an event. Same process applies to modify the -theme, functionality, or any other part of the website. +Either: +- Complete the event submission form [here](http://bit.ly/amsblockchainweek), or +- Clone this repo, duplicate `events/devconnect-amsterdam` folder, and follow the instructions in that folder's README.md. Once completed, submit a PR back to this Amsterdam Blockchain Week repo. diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 421a59289..716517a13 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,23 +1,17 @@ -name: Upload Website - -on: - push: - branches: - - master - +name: Build and Deploy +on: [push] jobs: - deploy: + build-and-deploy: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v1 - - - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: eu-west-3 + uses: actions/checkout@master - - name: Deploy static site to S3 bucket - run: aws s3 sync ./public/ s3://ethccweek.fr --delete \ No newline at end of file + - name: vuepress-deploy + uses: jenkey2011/vuepress-deploy@master + env: + ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }} + TARGET_REPO: mrdavey/AmsterdamBlockchainWeek + BUILD_SCRIPT: yarn && yarn build + BUILD_DIR: .vuepress/dist + CNAME: http://amsterdamblockchainweek.org \ No newline at end of file diff --git a/.gitignore b/.gitignore index 1e878f239..d4543485f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ .vuepress/dist node_modules/ instructions.txt -yarn.lock \ No newline at end of file +yarn.lock +.DS_store \ No newline at end of file diff --git a/.vuepress/.github/CNAME b/.vuepress/.github/CNAME deleted file mode 100644 index b332b6bfb..000000000 --- a/.vuepress/.github/CNAME +++ /dev/null @@ -1 +0,0 @@ -blockchainweek.fr diff --git a/.vuepress/.github/README.md b/.vuepress/.github/README.md deleted file mode 100644 index 79c1a036a..000000000 --- a/.vuepress/.github/README.md +++ /dev/null @@ -1,16 +0,0 @@ -# EthCC Week - Live Website - -This branch is the live website of the EthCC Week, which is -reachable at [ethccweek.fr] (https://ethccweek.fr). *Do not* -try to edit the content on this branch, or you're going to have a bad time. - -The source code for this page is on the -[master](https://github.com/ethccweek/website/tree/master) branch. -Do your modifications on that branch. - -## Contributing - -Please read the -[Wiki](https://github.com/ethccweek/website/wiki/Contributing) -for instructions on how to add an event. Same process applies to modify the -theme, functionality, or any other part of the website. diff --git a/.vuepress/components/Calendar.vue b/.vuepress/components/Calendar.vue index 13ace1923..f0a953744 100644 --- a/.vuepress/components/Calendar.vue +++ b/.vuepress/components/Calendar.vue @@ -7,7 +7,7 @@