captive_admin 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 768d49dd8ca3536e72e10052151ec5d2219301f4d28d156dfba3578d9b887d0d
-  data.tar.gz: '0496d73cb46ae0ffb71f7ae68e5aebd2051fa456e465907437cf685395fa67d8'
+  metadata.gz: 6ddcd4b44250598d163ee0ed11b88e4259337de716ddad97e3c8a46ca561f8f6
+  data.tar.gz: d007d5611d9fa1451ffba1a449f16889a1e27b9be9da69886e25a202d9bdc317
 SHA512:
-  metadata.gz: '003469e9696132247a891b8a018760b2033393cd0ca0027f7eb323a196ac47db5b8d0a7320c40f9b2d9c2ba030bc72f1dfdcbed405fc922795d199c389cb28ac'
-  data.tar.gz: 5054777dd4c804cf975bcc7dfb9f98ba4ad67b1c9cf883ba8134ecf7abbe041a8240f66d1046130500d44f3450b1b5fac4ffc00e817f92f6fa72c50e3a39ff9b
+  metadata.gz: ff3bad67b2e852971b5ad10b1313dafc8f246d96c9362fddd6df6db9e6668c0c8439d250ae2d25ddb1ee2d8e5038c6d202d53acd3ee68c2857fa6f3bec23c384
+  data.tar.gz: 6448cce4015aee08996a6f8e7378b87eb42bb24d1c5f31771798a6dd3f2bb5737c0876d371040129b4e798a1b5ae4fbc5502e20f893c734a88049cc918bf1b67

data/README.md

@@ -1,32 +1,37 @@
 # CaptiveAdmin
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/captive_admin`. To experiment with that code, run `bin/console` for an interactive prompt.
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+[![Gem Version](https://img.shields.io/gem/v/captive_admin.svg)](https://rubygems.org/gems/captive_admin)
 
-TODO: Delete this and the text above, and describe your gem
+A UI theme for ActiveAdmin that follows [Captive](https://captive.fr)'s Design System
 
-## Installation
-
-Install the gem and add to the application's Gemfile by executing:
-
-    $ bundle add captive_admin
+![Screenshot](doc/screenshot.png)
 
-If bundler is not being used to manage dependencies, install the gem by executing:
-
-    $ gem install captive_admin
-
-## Usage
+## Installation
 
-TODO: Write usage instructions here
+- Add this to you Gemfile:
 
-## Development
+```ruby
+gem 'captive_admin'
+```
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+- Run `bundle install`
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+- Edit `active_admin.scss` file
+  - Remove these two lines
+  ```scss
+  @import "active_admin/mixins";
+  @import "active_admin/base";
+  ```
+  - Replace with these two lines
+  ```scss
+  @import "captive_admin/mixins";
+  @import "captive_admin/base";
+  ```
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/captive_admin.
+Bug reports and pull requests are welcome on GitHub at https://github.com/Captive-Studio/captive_admin.
 
 ## License
 

data/app/assets/stylesheets/captive_admin/components/_tables.scss

@@ -2,5 +2,47 @@
 
 
 table.index_table {
+  @include shadow-xs;
+  border-radius: $border-radius-s;
+
+  th {
+    a, a:link, a:visited {
+      color: $fg-muted;
+    }
+
+    &.sorted-asc, &.sorted-desc {
+      background: $bg-default;
+      border-bottom: 2px solid $border-color-emphasis;
+    }
+
+    &:first-child {
+      border-top-left-radius: $border-radius-s;
+    }
+
+    &:last-child {
+      border-right: none;
+      border-top-right-radius: $border-radius-s;
+    }
+  }
+
+  tr {
+    &:last-child {
+      td {
+        &:first-child {
+          border-bottom-left-radius: $border-radius-s;
+        }
+
+        &:last-child {
+          border-bottom-right-radius: $border-radius-s;
+        }
+      }
+    }
+  }
+
   tr.even td { background: $bg-subtle; }
+
+  td {
+    border-bottom: none;
+    vertical-align: middle;
+  }
 }

data/app/assets/stylesheets/captive_admin/mixins/_all.scss

@@ -1,4 +1,5 @@
 @import "./variables";
+@import "./shadows";
 @import "./buttons";
 @import "./sections";
 @import "./typography";

data/app/assets/stylesheets/captive_admin/mixins/_buttons.scss

@@ -1,14 +1,64 @@
+@mixin basic-button {
+  //default AA style
+  @include rounded(200px);
+  display: inline-block;
+  font-weight: bold;
+  font-size: 1.0em;
+  @include sans-family;
+  line-height: 12px;
+  margin-right: 3px;
+  text-decoration: none;
+
+  &.disabled {
+    opacity: 0.5;
+    cursor: default;
+  }
+  //End default AA style
+  padding: $spacer-2 $spacer-4;
+  transition: background-color .3s;
+  box-shadow: $shadow-xs;
+}
 @mixin primary-button {
   background-color: $primary-emphasis;
   background-image: none;
   color: $primary-onEmphasis;
   border: none;
   text-shadow: none;
+  box-shadow: $shadow-s;
 
   &:not(.disabled) {
     &:hover{
       background-color: $primary-muted;
       background-image: none;
     }
+
+    &:active {
+      box-shadow: $shadow-xs;
+      background-image: none;
+    }
   }
 }
+
+@mixin outline-button {
+  // style AA
+  @include basic-button;
+  outline: solid 1px;
+  color: $fg-muted;
+  background-color: $bg-subtle;
+
+  &:not(.disabled) {
+    &:hover {
+      background-color: $bg-default;
+    }
+
+    &:active {
+      background-color: $bg-emphasis;
+      color: $fg-onEmphasis
+    }
+  }
+}
+
+
+@mixin light-button {
+  @include outline-button;
+}

data/app/assets/stylesheets/captive_admin/mixins/_sections.scss

@@ -1,3 +1,20 @@
+@mixin section-header {
+  // héritage AA
+
+  font-size: 1em;
+  font-weight: bold;
+  line-height: 18px;
+  margin-bottom: 0.5em;
+
+  // Fin héritage AA
+  padding: $spacer-2 $spacer-4;
+
+  color: $fg-muted;
+  background: $bg-subtle;
+  border-bottom: 1px solid $border-color;
+  // @include shadow-xs;
+}
+
 @mixin section-background {
   background: $bg-subtle;
 

data/app/assets/stylesheets/captive_admin/mixins/_shadows.scss

@@ -0,0 +1,3 @@
+@mixin shadow-xs {
+  box-shadow: $shadow-xs;
+}

data/app/assets/stylesheets/captive_admin/mixins/_variables.scss

@@ -5,6 +5,7 @@ $white: #FFFFFF;
 $blue-grey-900: #102A43;
 $blue-grey-600: #486581;
 $blue-grey-500: #5E7997;
+$blue-grey-200: #BCCCDC;
 $blue-grey-050: #F5F7FA;
 
 $pink-vivid-500: #D9127C;
@@ -74,6 +75,9 @@ $support-emphasis: $purple-700;
 $support-muted: $purple-500;
 $support-subtle: $purple-050;
 
+$border-color: $blue-grey-200;
+$border-color-emphasis: $blue-grey-900;
+
 
 // Espacements
 // Cf https://www.notion.so/captive/UI-Espacement-du-Design-System-Captive-cc192b02b57d453fa0da9fdc6d1234c2
@@ -94,7 +98,19 @@ $spacer-12: 256px;
 
 // Fonts
 // https://www.notion.so/captive/Typographie-Captive-85c60f5a849f4adaacaf18cc4aff2cea
-@import url('https://fonts.googleapis.com/css2?family=Open+Sans&family=Barlow:wght@400;600&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;600&family=Barlow:wght@400;600&display=swap');
 
 $default-font-family: "Open Sans", -apple-system, Segoe UI, Roboto, Noto Sans, Ubuntu, Cantarell, Helvetica Neue;
 $title-font-family: "Barlow", -apple-system, Segoe UI, Roboto, Noto Sans, Ubuntu, Cantarell, Helvetica Neue;
+
+
+// Shadows
+$shadow-xs: 0 1px 3px rgba(0,0,0,.12), 0 1px 2px rgba(0,0,0,.24);
+$shadow-s: 0 3px 6px rgba(0,0,0,.15), 0 2px 4px rgba(0,0,0,.12);
+$shadow-m: 0 10px 20px rgba(0,0,0,.15), 0 3px 6px rgba(0,0,0,.10);
+$shadow-l: 0 15px 25px rgba(0,0,0,.15), 0 5px 10px rgba(0,0,0,.05);
+$shadow-xl: 0 20px 40px rgba(0,0,0,.2);
+
+
+// radius
+$border-radius-s: 12px

data/app/assets/stylesheets/captive_admin/structure/_title_bar.scss

@@ -3,6 +3,7 @@
     span.action_item {
       & > a, & > .dropdown_menu > a {
         @include primary-button;
+        padding: $spacer-3 $spacer-4;
       }
     }
   }

data/lib/captive_admin/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CaptiveAdmin
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "local>Captive-Studio/renovate-config"
+  ]
+}

data/script/release

@@ -0,0 +1,66 @@
+#!/bin/sh
+
+##
+# This script creates a new version of a gem on a GitHub repository.
+# You can run it with 'script/release major', 'script/release minor', or 'script/release patch' to create the corresponding release.
+# You can also add a second optional argument for the version suffix.
+#
+#
+# Tradeoffs of this solutions :
+# Advantages
+# - Captive still have its ownership of the repository: every rule is explicit in its configuration
+# - Captive can disable the sync script if there is a problem with @w5s/eslint-config
+#
+# Drawbacks
+# - When pulling changes, semantic versioning information is lost (breaking changes, etc)
+#
+cd $(dirname $(dirname $0))
+ROOT=`pwd`
+cd $ROOT;
+
+
+# Check if the current branch is the main branch
+branch=$(git branch --show-current)
+if [ "$branch" != "main" ]; then
+  echo "You are not on the main branch"
+  exit 1
+fi
+
+# Get the latest version of the code
+git pull origin main
+
+# Determine the current version of the gem
+version=$(grep -E "VERSION = '[0-9]+\.[0-9]+\.[0-9]+" lib/captive_admin/version.rb | cut -d "'" -f 2)
+echo "Current version is ${version}"
+
+# Determine the version to release
+if [ "$1" == "major" ]; then
+  new_version=$(echo "${version}" | awk -F. '{$1++; print $1"."0"."0}')
+elif [ "$1" == "minor" ]; then
+  new_version=$(echo "${version}" | awk -F. '{$2++; print $1"."$2"."0}')
+elif [ "$1" == "patch" ]; then
+  new_version=$(echo "${version}" | awk -F. '{$3++; print $1"."$2"."$3}')
+else
+  echo "Usage : script/release (major|minor|patch) [version-suffix]"
+  exit 1
+fi
+
+# Add suffix to the new version, if specified
+if [ ! -z "$2" ]; then
+  new_version="${new_version}-${2}"
+fi
+
+echo "Creating version ${new_version} ..."
+
+# Update the version in captive_admin/version.rb
+sed -i '' "s/VERSION = '${version}'/VERSION = '${new_version}'/" lib/captive_admin/version.rb
+
+# Add the modified file and create a commit
+git add lib/captive_admin/version.rb
+git commit -m "🔖 Publish version ${new_version}"
+
+# Create a new release on GitHub
+git tag ${new_version}
+git push origin ${new_version}
+
+echo "Version ${new_version} created."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: captive_admin
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Captive
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-13 00:00:00.000000000 Z
+date: 2023-07-18 00:00:00.000000000 Z
 dependencies: []
 description: Un thème pour ActiveAdmin aux couleurs de Captive.
 email:
@@ -36,12 +36,16 @@ files:
 - app/assets/stylesheets/captive_admin/mixins/_all.scss
 - app/assets/stylesheets/captive_admin/mixins/_buttons.scss
 - app/assets/stylesheets/captive_admin/mixins/_sections.scss
+- app/assets/stylesheets/captive_admin/mixins/_shadows.scss
 - app/assets/stylesheets/captive_admin/mixins/_typography.scss
 - app/assets/stylesheets/captive_admin/mixins/_variables.scss
 - app/assets/stylesheets/captive_admin/pages/_logged_out.scss
 - app/assets/stylesheets/captive_admin/structure/_title_bar.scss
+- doc/screenshot.png
 - lib/captive_admin.rb
 - lib/captive_admin/version.rb
+- renovate.json
+- script/release
 - sig/captive_admin.rbs
 homepage: https://github.com/Captive-Studio/captive_admin
 licenses: