From 20c6320dcd599cbf65ac7baa814e371ac0f52b7f Mon Sep 17 00:00:00 2001 From: CactusPuppy Date: Wed, 17 Feb 2021 15:17:54 -0800 Subject: [PATCH 01/12] Add Badges except for Bluejay --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 2fe87dcf..64243d7e 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -[![Build Status](https://travis-ci.org/openSUSE/osem.svg?branch=master)](https://travis-ci.org/openSUSE/osem) -[![Code Climate](https://codeclimate.com/github/openSUSE/osem.png)](https://codeclimate.com/github/openSUSE/osem) -[![codecov](https://codecov.io/gh/opensuse/osem/branch/master/graph/badge.svg)](https://codecov.io/gh/opensuse/osem) -[![Security Status](https://hakiri.io/github/openSUSE/osem/master.svg)](https://hakiri.io/github/openSUSE/osem/master) -[![Dependencies](https://badges.depfu.com/badges/8fcd630367d20f5b48d393774c00c5fd/overview.svg)](https://depfu.com/repos/openSUSE/osem) +[![Build Status](https://travis-ci.com/CactusPuppy/snapcon.svg?branch=master)](https://travis-ci.com/CactusPuppy/snapcon) +[![Maintainability](https://api.codeclimate.com/v1/badges/6c7fc446b3b10866ba71/maintainability)](https://codeclimate.com/github/CactusPuppy/snapcon/maintainability) +[![codecov](https://codecov.io/gh/CactusPuppy/snapcon/branch/master/graph/badge.svg?token=y4aEAtw6KJ)](https://codecov.io/gh/CactusPuppy/snapcon) +[![Security Status](https://hakiri.io/github/CactusPuppy/snapcon/master.svg)](https://hakiri.io/github/CactusPuppy/snapcon/master) +[![Depfu](https://badges.depfu.com/badges/16eb1ffb3a9f1a36c4e595a5ae2a1dca/overview.svg)](https://depfu.com/github/CactusPuppy/snapcon?project_id=22682) Deploy From f473ca838ff2dbca71c3bd480f548f5ed99672ce Mon Sep 17 00:00:00 2001 From: CactusPuppy Date: Wed, 17 Feb 2021 21:48:18 -0800 Subject: [PATCH 02/12] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 64243d7e..46ea6cab 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ [![codecov](https://codecov.io/gh/CactusPuppy/snapcon/branch/master/graph/badge.svg?token=y4aEAtw6KJ)](https://codecov.io/gh/CactusPuppy/snapcon) [![Security Status](https://hakiri.io/github/CactusPuppy/snapcon/master.svg)](https://hakiri.io/github/CactusPuppy/snapcon/master) [![Depfu](https://badges.depfu.com/badges/16eb1ffb3a9f1a36c4e595a5ae2a1dca/overview.svg)](https://depfu.com/github/CactusPuppy/snapcon?project_id=22682) +[![Bluejay Dashboard](https://img.shields.io/badge/Bluejay-Dashboard_5-blue.svg)](http://dashboard.bluejay.governify.io/dashboard/script/dashboardLoader.js?dashboardURL=https://reporter.bluejay.governify.io/api/v4/dashboards/tpa-CS169L-GH-CactusPuppy_snapcon/main) Deploy From ae05f5166982c3e3614e5fd34e80bcf4ba8676a3 Mon Sep 17 00:00:00 2001 From: CactusPuppy Date: Wed, 10 Feb 2021 17:10:18 -0800 Subject: [PATCH 03/12] Add ability to use local environment variables via config/local_env.yml --- .gitignore | 1 + config/application.rb | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/.gitignore b/.gitignore index 8331c5c8..ee9739f8 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ docker-compose.override.yml .buildconfig osem_development osem_test +config/local_env.yml diff --git a/config/application.rb b/config/application.rb index e3483d4a..874f4456 100644 --- a/config/application.rb +++ b/config/application.rb @@ -65,5 +65,12 @@ module Osem config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=31536000' } config.active_job.queue_adapter = :delayed_job + + config.before_configuration do + env_file = File.join(Rails.root, 'config', 'local_env.yml') + YAML.load(File.open(env_file)).each do |key, value| + ENV[key.to_s] = value + end if File.exists?(env_file) + end end end From d6da9b6380d2fe8456b884837e54df56059e9d60 Mon Sep 17 00:00:00 2001 From: CactusPuppy Date: Thu, 11 Feb 2021 16:17:13 -0800 Subject: [PATCH 04/12] Add back user/password loading --- config/database.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/database.yml b/config/database.yml index ecf07a0f..e8a3d502 100644 --- a/config/database.yml +++ b/config/database.yml @@ -11,8 +11,8 @@ default: &default encoding: <%= encoding %> host: <%= ENV['OSEM_DB_HOST'] || 'database' %> port: <%= ENV['OSEM_DB_PORT'] || '5432' %> - # username: <%= ENV['OSEM_DB_USER'] || 'postgres' %> - # password: <%= ENV['OSEM_DB_PASSWORD'] || 'mysecretpassword' %> + username: <%= ENV['OSEM_DB_USER'] || 'postgres' %> + password: <%= ENV['OSEM_DB_PASSWORD'] || 'mysecretpassword' %> database: <%= ENV['OSEM_DB_NAME'] || 'postgres' %> pool: 5 timeout: 50000 From d1ebc025d34d173e8d119c06bdcf02eddae773f0 Mon Sep 17 00:00:00 2001 From: Ziyi Date: Wed, 17 Feb 2021 12:44:25 -0800 Subject: [PATCH 05/12] gitignore for Mac --- .gitignore | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/.gitignore b/.gitignore index ee9739f8..f35f94d2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,23 @@ +# Global, for Macs +*~ + +# Compiled Python files +*.pyc + +# Folder view configuration files +.DS_Store +Desktop.ini + +# Thumbnail cache files +._* +Thumbs.db + +# Files that might appear on external disks +.Spotlight-V100 +.Trashes + + +# Legacy from before Feb 2021 /db/test.sqlite3-journal config/application.rb config/config.yml @@ -41,3 +61,62 @@ docker-compose.override.yml osem_development osem_test config/local_env.yml + +# From GitHub, for Ruby +# https://github.com/github/gitignore/blob/master/Ruby.gitignore +*.gem +*.rbc +/.config +/coverage/ +/InstalledFiles +/pkg/ +/spec/reports/ +/spec/examples.txt +/test/tmp/ +/test/version_tmp/ +/tmp/ + +# Used by dotenv library to load environment variables. +# .env + +# Ignore Byebug command history file. +.byebug_history + +## Specific to RubyMotion: +.dat* +.repl_history +build/ +*.bridgesupport +build-iPhoneOS/ +build-iPhoneSimulator/ + +## Specific to RubyMotion (use of CocoaPods): +# +# We recommend against adding the Pods directory to your .gitignore. However +# you should judge for yourself, the pros and cons are mentioned at: +# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control +# +# vendor/Pods/ + +## Documentation cache and generated files: +/.yardoc/ +/_yardoc/ +/doc/ +/rdoc/ + +## Environment normalization: +/.bundle/ +/vendor/bundle +/lib/bundler/man/ + +# for a library or gem, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# Gemfile.lock +# .ruby-version +# .ruby-gemset + +# unless supporting rvm < 1.11.0 or doing something fancy, ignore this: +.rvmrc + +# Used by RuboCop. Remote config files pulled in from inherit_from directive. +.rubocop-https?--* From 65e2509c704e20da59c4316ba0b0ffe7e597012b Mon Sep 17 00:00:00 2001 From: CactusPuppy Date: Wed, 17 Feb 2021 17:17:30 -0800 Subject: [PATCH 06/12] Create info.yml --- info.yml | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 info.yml diff --git a/info.yml b/info.yml new file mode 100644 index 00000000..1a5487d0 --- /dev/null +++ b/info.yml @@ -0,0 +1,44 @@ +project: + name: 'snapcon' + owner: 'cs169' + teamId: '5' + identities: + pivotal: + url: 'https://www.pivotaltracker.com/n/projects/2487653' + heroku: + url: 'https://http://cs169l-sp2021-snapcon.herokuapp.com' + travis: + url: 'https://travis-ci.com/github/CactusPuppy/snapcon' + codeclimate: + url: 'https://codeclimate.com/github/CactusPuppy/snapcon' + members: + member1: + name: 'Rajavi' + surname: 'Mishra' + githubUsername: 'rajavi-mishra' + pivotalUsername: 'rajavimishra' + herokuEmail: 'rajavi.mishra@berkeley.edu' + member2: + name: 'Jimmy' + surname: 'Xu' + githubUsername: 'kingdish' + pivotalUsername: 'kingdish' + herokuEmail: 'jimmyxu1997@berkeley.edu' + member3: + name: 'Coby' + surname: 'Zhong' + githubUsername: 'CactusPuppy' + pivotalUsername: 'cobyzhong' + herokuEmail: 'coby.zhong@berkeley.edu' + member4: + name: 'Esha' + surname: 'Madhekare' + githubUsername: 'madhekare' + pivotalUsername: 'eshamadhekar' + herokuEmail: 'esha@berkeley.edu' + member5: + name: 'Ziyi' + surname: 'Lu' + githubUsername: 'lzy-106' + pivotalUsername: 'lzy_1006' + herokuEmail: 'lzy-1006@berkeley.edu' From 424b225abd73074d2492be718bbcd3c0fa3f160f Mon Sep 17 00:00:00 2001 From: CactusPuppy Date: Wed, 17 Feb 2021 17:21:02 -0800 Subject: [PATCH 07/12] Update info.yml --- info.yml | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/info.yml b/info.yml index 1a5487d0..1affa50a 100644 --- a/info.yml +++ b/info.yml @@ -13,32 +13,8 @@ project: url: 'https://codeclimate.com/github/CactusPuppy/snapcon' members: member1: - name: 'Rajavi' - surname: 'Mishra' - githubUsername: 'rajavi-mishra' - pivotalUsername: 'rajavimishra' - herokuEmail: 'rajavi.mishra@berkeley.edu' - member2: - name: 'Jimmy' - surname: 'Xu' - githubUsername: 'kingdish' - pivotalUsername: 'kingdish' - herokuEmail: 'jimmyxu1997@berkeley.edu' - member3: name: 'Coby' surname: 'Zhong' githubUsername: 'CactusPuppy' pivotalUsername: 'cobyzhong' herokuEmail: 'coby.zhong@berkeley.edu' - member4: - name: 'Esha' - surname: 'Madhekare' - githubUsername: 'madhekare' - pivotalUsername: 'eshamadhekar' - herokuEmail: 'esha@berkeley.edu' - member5: - name: 'Ziyi' - surname: 'Lu' - githubUsername: 'lzy-106' - pivotalUsername: 'lzy_1006' - herokuEmail: 'lzy-1006@berkeley.edu' From 3b724c28fae5f90c9b46edd167da996ef4223aac Mon Sep 17 00:00:00 2001 From: CactusPuppy Date: Wed, 17 Feb 2021 17:47:35 -0800 Subject: [PATCH 08/12] Remove double HTTP from app URL --- info.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.yml b/info.yml index 1affa50a..ab0afd5e 100644 --- a/info.yml +++ b/info.yml @@ -6,7 +6,7 @@ project: pivotal: url: 'https://www.pivotaltracker.com/n/projects/2487653' heroku: - url: 'https://http://cs169l-sp2021-snapcon.herokuapp.com' + url: 'https://cs169l-sp2021-snapcon.herokuapp.com' travis: url: 'https://travis-ci.com/github/CactusPuppy/snapcon' codeclimate: From c9a6f55499b3e8c93aa7c9418989c4ccec5ac881 Mon Sep 17 00:00:00 2001 From: CactusPuppy Date: Wed, 17 Feb 2021 15:17:54 -0800 Subject: [PATCH 09/12] Add Badges except for Bluejay --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 2fe87dcf..64243d7e 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -[![Build Status](https://travis-ci.org/openSUSE/osem.svg?branch=master)](https://travis-ci.org/openSUSE/osem) -[![Code Climate](https://codeclimate.com/github/openSUSE/osem.png)](https://codeclimate.com/github/openSUSE/osem) -[![codecov](https://codecov.io/gh/opensuse/osem/branch/master/graph/badge.svg)](https://codecov.io/gh/opensuse/osem) -[![Security Status](https://hakiri.io/github/openSUSE/osem/master.svg)](https://hakiri.io/github/openSUSE/osem/master) -[![Dependencies](https://badges.depfu.com/badges/8fcd630367d20f5b48d393774c00c5fd/overview.svg)](https://depfu.com/repos/openSUSE/osem) +[![Build Status](https://travis-ci.com/CactusPuppy/snapcon.svg?branch=master)](https://travis-ci.com/CactusPuppy/snapcon) +[![Maintainability](https://api.codeclimate.com/v1/badges/6c7fc446b3b10866ba71/maintainability)](https://codeclimate.com/github/CactusPuppy/snapcon/maintainability) +[![codecov](https://codecov.io/gh/CactusPuppy/snapcon/branch/master/graph/badge.svg?token=y4aEAtw6KJ)](https://codecov.io/gh/CactusPuppy/snapcon) +[![Security Status](https://hakiri.io/github/CactusPuppy/snapcon/master.svg)](https://hakiri.io/github/CactusPuppy/snapcon/master) +[![Depfu](https://badges.depfu.com/badges/16eb1ffb3a9f1a36c4e595a5ae2a1dca/overview.svg)](https://depfu.com/github/CactusPuppy/snapcon?project_id=22682) Deploy From eaf4cef3c286d10c483bdd4111158b4b8fef8157 Mon Sep 17 00:00:00 2001 From: CactusPuppy Date: Wed, 17 Feb 2021 21:48:18 -0800 Subject: [PATCH 10/12] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 64243d7e..46ea6cab 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ [![codecov](https://codecov.io/gh/CactusPuppy/snapcon/branch/master/graph/badge.svg?token=y4aEAtw6KJ)](https://codecov.io/gh/CactusPuppy/snapcon) [![Security Status](https://hakiri.io/github/CactusPuppy/snapcon/master.svg)](https://hakiri.io/github/CactusPuppy/snapcon/master) [![Depfu](https://badges.depfu.com/badges/16eb1ffb3a9f1a36c4e595a5ae2a1dca/overview.svg)](https://depfu.com/github/CactusPuppy/snapcon?project_id=22682) +[![Bluejay Dashboard](https://img.shields.io/badge/Bluejay-Dashboard_5-blue.svg)](http://dashboard.bluejay.governify.io/dashboard/script/dashboardLoader.js?dashboardURL=https://reporter.bluejay.governify.io/api/v4/dashboards/tpa-CS169L-GH-CactusPuppy_snapcon/main) Deploy From a932c6dd036ba4843e70639d85c43a8657789f51 Mon Sep 17 00:00:00 2001 From: Ziyi Date: Fri, 19 Feb 2021 17:50:03 -0800 Subject: [PATCH 11/12] Pivotal badge on README --- README.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/README.md b/README.md index 46ea6cab..bd15cffc 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,37 @@ [![Build Status](https://travis-ci.com/CactusPuppy/snapcon.svg?branch=master)](https://travis-ci.com/CactusPuppy/snapcon) + [![Maintainability](https://api.codeclimate.com/v1/badges/6c7fc446b3b10866ba71/maintainability)](https://codeclimate.com/github/CactusPuppy/snapcon/maintainability) + [![codecov](https://codecov.io/gh/CactusPuppy/snapcon/branch/master/graph/badge.svg?token=y4aEAtw6KJ)](https://codecov.io/gh/CactusPuppy/snapcon) + [![Security Status](https://hakiri.io/github/CactusPuppy/snapcon/master.svg)](https://hakiri.io/github/CactusPuppy/snapcon/master) + [![Depfu](https://badges.depfu.com/badges/16eb1ffb3a9f1a36c4e595a5ae2a1dca/overview.svg)](https://depfu.com/github/CactusPuppy/snapcon?project_id=22682) + [![Bluejay Dashboard](https://img.shields.io/badge/Bluejay-Dashboard_5-blue.svg)](http://dashboard.bluejay.governify.io/dashboard/script/dashboardLoader.js?dashboardURL=https://reporter.bluejay.governify.io/api/v4/dashboards/tpa-CS169L-GH-CactusPuppy_snapcon/main) + Deploy + + + Pivotal Tracker + + # Open Source Event Manager - [osem.io](https://osem.io) + ![OSEM Logo](doc/osem-logo.png) An event management tool tailored to Free and Open Source Software conferences. ## Installation + Please refer to our [installation guide](INSTALL.md). ## How to contribute to OSEM + Please refer to our [contributing guide](CONTRIBUTING.md). ## Contact + GitHub issues are the primary way for communicating about specific proposed changes to this project. If you have other questions feel free to subscribe to the [opensuse-web@opensuse.org](http://lists.opensuse.org/opensuse-web/) mailinglist, all OSEM contributors are on that list! Additionally you can use #osem channel on freenode IRC. From c79aa1f8bfde178f040e93354d799e375315d4d9 Mon Sep 17 00:00:00 2001 From: Ziyi Date: Fri, 19 Feb 2021 17:50:53 -0800 Subject: [PATCH 12/12] Reformat README badges --- README.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/README.md b/README.md index bd15cffc..09356477 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,8 @@ [![Build Status](https://travis-ci.com/CactusPuppy/snapcon.svg?branch=master)](https://travis-ci.com/CactusPuppy/snapcon) - [![Maintainability](https://api.codeclimate.com/v1/badges/6c7fc446b3b10866ba71/maintainability)](https://codeclimate.com/github/CactusPuppy/snapcon/maintainability) - [![codecov](https://codecov.io/gh/CactusPuppy/snapcon/branch/master/graph/badge.svg?token=y4aEAtw6KJ)](https://codecov.io/gh/CactusPuppy/snapcon) - [![Security Status](https://hakiri.io/github/CactusPuppy/snapcon/master.svg)](https://hakiri.io/github/CactusPuppy/snapcon/master) - [![Depfu](https://badges.depfu.com/badges/16eb1ffb3a9f1a36c4e595a5ae2a1dca/overview.svg)](https://depfu.com/github/CactusPuppy/snapcon?project_id=22682) - [![Bluejay Dashboard](https://img.shields.io/badge/Bluejay-Dashboard_5-blue.svg)](http://dashboard.bluejay.governify.io/dashboard/script/dashboardLoader.js?dashboardURL=https://reporter.bluejay.governify.io/api/v4/dashboards/tpa-CS169L-GH-CactusPuppy_snapcon/main)